bitkeeper revision 1.1236.1.113 (42407388qtYnzMaBpNXqBANV55c6Qw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 22 Mar 2005 19:35:36 +0000 (19:35 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 22 Mar 2005 19:35:36 +0000 (19:35 +0000)
commit2ad15d851f8c1e543cb43901adbbcb649ea7ef74
treef35d1b61a7ae7eec0c37067a1791bb3d3e77240b
parent689abd270c3c4c485e342837caf4dfc4b4904c84
parent16ca18af9004f25512a33bf60e131bfe2a6dac1a
bitkeeper revision 1.1236.1.113 (42407388qtYnzMaBpNXqBANV55c6Qw)

Manual merge.
xen/arch/x86/domain.c
xen/common/page_alloc.c
xen/common/schedule.c